From 0c2878345a2d767a7dd1e9d2e10bed93de6cf598 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 23 Mar 2015 16:56:29 -0700
Subject: [PATCH] Fix tests for windows

---
 tests/test_cargo_compile_custom_build.rs |  4 ++--
 tests/test_cargo_compile_git_deps.rs     |  4 ++--
 tests/test_cargo_run.rs                  | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/test_cargo_compile_custom_build.rs b/tests/test_cargo_compile_custom_build.rs
index 58645c54f..301a10b8f 100644
--- a/tests/test_cargo_compile_custom_build.rs
+++ b/tests/test_cargo_compile_custom_build.rs
@@ -485,7 +485,7 @@ test!(testing_and_such {
 {running} `[..]build-script-build[..]`
 {running} `rustc [..] --crate-name foo [..]`
 {running} `rustc [..] --crate-name foo [..]`
-{running} `[..]foo-[..]`
+{running} `[..]foo-[..][..]`
 
 running 0 tests
 
@@ -515,7 +515,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured
                 execs().with_status(0)
                        .with_stdout(format!("\
 {compiling} foo v0.5.0 (file://[..])
-{running} `target[..]foo`
+{running} `target[..]foo[..]`
 ", compiling = COMPILING, running = RUNNING).as_slice()));
 });
 
diff --git a/tests/test_cargo_compile_git_deps.rs b/tests/test_cargo_compile_git_deps.rs
index cae0dcadd..86a8bbfdf 100644
--- a/tests/test_cargo_compile_git_deps.rs
+++ b/tests/test_cargo_compile_git_deps.rs
@@ -965,7 +965,7 @@ test!(dep_with_changed_submodule {
                 .with_stdout(format!("{} git repository `[..]`\n\
                                       {} dep1 v0.5.0 ([..])\n\
                                       {} foo v0.5.0 ([..])\n\
-                                      {} `target[..]foo`\n\
+                                      {} `target[..]foo[..]`\n\
                                       project2\
                                       ",
                                       UPDATING,
@@ -1010,7 +1010,7 @@ test!(dep_with_changed_submodule {
     assert_that(project.cargo("run"), execs()
                 .with_stdout(format!("{compiling} dep1 v0.5.0 ([..])\n\
                                       {compiling} foo v0.5.0 ([..])\n\
-                                      {running} `target[..]foo`\n\
+                                      {running} `target[..]foo[..]`\n\
                                       project3\
                                       ",
                                       compiling = COMPILING, running = RUNNING))
diff --git a/tests/test_cargo_run.rs b/tests/test_cargo_run.rs
index b291aa6fc..8956c744b 100644
--- a/tests/test_cargo_run.rs
+++ b/tests/test_cargo_run.rs
@@ -22,7 +22,7 @@ test!(simple {
     assert_that(p.cargo_process("run"),
                 execs().with_status(0).with_stdout(format!("\
 {compiling} foo v0.0.1 ({dir})
-{running} `target{sep}debug{sep}foo`
+{running} `target{sep}debug{sep}foo[..]`
 hello
 ",
         compiling = COMPILING,
@@ -125,7 +125,7 @@ test!(specify_name {
 {compiling} foo v0.0.1 ({dir})
 {running} `rustc src[..]lib.rs [..]`
 {running} `rustc src[..]a.rs [..]`
-{running} `target{sep}debug{sep}a`
+{running} `target{sep}debug{sep}a[..]`
 hello a.rs
 ",
         compiling = COMPILING,
@@ -137,7 +137,7 @@ hello a.rs
                 execs().with_status(0).with_stdout(format!("\
 {compiling} foo v0.0.1 ([..])
 {running} `rustc src[..]b.rs [..]`
-{running} `target{sep}debug{sep}b`
+{running} `target{sep}debug{sep}b[..]`
 hello b.rs
 ",
         running = RUNNING, compiling = COMPILING,
@@ -163,7 +163,7 @@ test!(run_example {
     assert_that(p.cargo_process("run").arg("--example").arg("a"),
                 execs().with_status(0).with_stdout(format!("\
 {compiling} foo v0.0.1 ({dir})
-{running} `target{sep}debug{sep}examples{sep}a`
+{running} `target{sep}debug{sep}examples{sep}a[..]`
 example
 ",
         compiling = COMPILING,
@@ -216,7 +216,7 @@ test!(one_bin_multiple_examples {
     assert_that(p.cargo_process("run"),
                 execs().with_status(0).with_stdout(format!("\
 {compiling} foo v0.0.1 ({dir})
-{running} `target{sep}debug{sep}main`
+{running} `target{sep}debug{sep}main[..]`
 hello main.rs
 ",
         compiling = COMPILING,
@@ -289,7 +289,7 @@ test!(example_with_release_flag {
         -L dependency={dir}{sep}target{sep}release \
         -L dependency={dir}{sep}target{sep}release{sep}deps \
          --extern bar={dir}{sep}target{sep}release{sep}deps{sep}libbar-[..].rlib`
-{running} `target{sep}release{sep}examples{sep}a`
+{running} `target{sep}release{sep}examples{sep}a[..]`
 fast1
 fast2
 ",
@@ -318,7 +318,7 @@ fast2
         -L dependency={dir}{sep}target{sep}debug \
         -L dependency={dir}{sep}target{sep}debug{sep}deps \
          --extern bar={dir}{sep}target{sep}debug{sep}deps{sep}libbar-[..].rlib`
-{running} `target{sep}debug{sep}examples{sep}a`
+{running} `target{sep}debug{sep}examples{sep}a[..]`
 slow1
 slow2
 ",
@@ -375,7 +375,7 @@ test!(release_works {
     assert_that(p.cargo_process("run").arg("--release"),
                 execs().with_status(0).with_stdout(format!("\
 {compiling} foo v0.0.1 ({dir})
-{running} `target{sep}release{sep}foo`
+{running} `target{sep}release{sep}foo[..]`
 ",
         compiling = COMPILING,
         running = RUNNING,
-- 
2.30.2